From 05d785685bfcd4ac49558176071da9f95cfc0364 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 19 Jun 2006 17:16:14 +0000 Subject: [PATCH] Clarify the use of these functions, to avoid the case where a chooser is 2006-06-19 Federico Mena Quintero * gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder) (gtk_file_chooser_get_current_folder_uri): Clarify the use of these functions, to avoid the case where a chooser is in SELECT_FOLDER mode and people mistakenly use _get_current_folder() to get the selection: they should use _get_filename() instead. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ gtk/gtkfilechooser.c | 16 ++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/ChangeLog b/ChangeLog index f557a31b06..62216fecae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-06-19 Federico Mena Quintero + + * gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder) + (gtk_file_chooser_get_current_folder_uri): Clarify the use of + these functions, to avoid the case where a chooser is in + SELECT_FOLDER mode and people mistakenly use _get_current_folder() + to get the selection: they should use _get_filename() instead. + 2006-06-19 Alexander Larsson * gtk/gtk.symbols: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f557a31b06..62216fecae 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2006-06-19 Federico Mena Quintero + + * gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder) + (gtk_file_chooser_get_current_folder_uri): Clarify the use of + these functions, to avoid the case where a chooser is in + SELECT_FOLDER mode and people mistakenly use _get_current_folder() + to get the selection: they should use _get_filename() instead. + 2006-06-19 Alexander Larsson * gtk/gtk.symbols: diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index 4ed46e9a85..a522a9df36 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -690,6 +690,14 @@ gtk_file_chooser_set_current_folder (GtkFileChooser *chooser, * * Gets the current folder of @chooser as a local filename. * See gtk_file_chooser_set_current_folder(). + * + * Note that this is the folder that the file chooser is currently displaying + * (e.g. "/home/username/Documents"), which is not the same + * as the currently-selected folder if the chooser is in + * #GTK_FILE_CHOOSER_SELECT_FOLDER mode + * (e.g. "/home/username/Documents/selected-folder/". To get the + * currently-selected folder in that mode, use gtk_file_chooser_get_uri() as the + * usual way to get the selection. * * Return value: the full path of the current folder, or %NULL if the current * path cannot be represented as a local filename. Free with g_free(). This @@ -1014,6 +1022,14 @@ gtk_file_chooser_set_current_folder_uri (GtkFileChooser *chooser, * * Gets the current folder of @chooser as an URI. * See gtk_file_chooser_set_current_folder_uri(). + * + * Note that this is the folder that the file chooser is currently displaying + * (e.g. "file:///home/username/Documents"), which is not the same + * as the currently-selected folder if the chooser is in + * #GTK_FILE_CHOOSER_SELECT_FOLDER mode + * (e.g. "file:///home/username/Documents/selected-folder/". To get the + * currently-selected folder in that mode, use gtk_file_chooser_get_uri() as the + * usual way to get the selection. * * Return value: the URI for the current folder. Free with g_free(). This * function will also return %NULL if the file chooser was unable to load the -- 2.30.2